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