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