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