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