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