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