[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01
am: d351303e36
-s ours am: 499cfe303f
-s ours am: 48ceb503d8
-s ours am: 7f4a301b88
-s ours am: b03a49d16e
-s ours am: 1649b3f464
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917 Change-Id: Ife66bc46a93d0a76f08ee02a225ec78249c67be2
This commit is contained in: