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