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