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