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