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