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