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