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