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