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