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