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