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