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