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