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