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