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