[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: a8cf9a798d
-s ours am: 4d789befc6
-s ours
am skip reason: Merged-In I73964718e9b3d66dbe189f48bfe6d1b16ec921f4 with SHA-1 e774cf9cd3
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1741495
Change-Id: I35f835fd2ccff7e61822cbfd94839b0702beefea
This commit is contained in: