[automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f
am: c41debcf7f
-s ours am: 06e9e8b3a9
-s ours am: ff21be103b
-s ours
am skip reason: Merged-In I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700137
Change-Id: I6d040ee582aeab0c571b8e860e4b2ab9b3bd8b8e
This commit is contained in: