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