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