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