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