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