Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730676



Change-Id: Ia021a8974fa666e1aa2b5f87418bd1096473f2eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>