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