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