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