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