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