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