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