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