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