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