[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: 73f346b222
-s ours am: 2ad56b2073
-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: I7e0d8e0f64182ec22a3afdd94e7461e9ce8714d7
This commit is contained in: