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