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