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