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