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