[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8
-s ours am: d6bc0a328f
-s ours am: 5036eee733
am: 535f5ba053
-s ours am: d62def70c7
am: bfd2571c3b
am: 28243b2996
am: 6591058f84
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic47215debf6c0338033d4fdf35fcc551b9e4961f
This commit is contained in: