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