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