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