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