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