Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485 Change-Id: Iddb91c4d9f6e17701c645c5c47af8d34cbb6f717 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>