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