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