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