[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f
-s ours am: 505cc44596
-s ours am: 3fcb9c9811
-s ours am: 0cfe42b287
-s ours am: 49d4c89944
-s ours am: 985d52d0c6
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918 Change-Id: Ief541023b30b0bf82ea24a88a56fbcf105efe58f
This commit is contained in: