[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours am: e849d212b7
-s ours am: b8aa9ad04d
-s ours am: 2a2a81dea5
-s ours am: 346b049fb1
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141 Change-Id: I1b667afef2b3858cb3cb627404090e5de7dba48b
This commit is contained in: