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