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