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