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