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