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