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