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