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