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