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