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