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