[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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I74b19a40f47bf2c67ba55cbd9c158c34320a75b8
This commit is contained in: