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