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