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