[automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into rvc-qpr-dev am: 9c105d911a
-s ours am: 85524a7276
-s ours am: 5af1f843fd
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021916 Change-Id: I7d55d6194c47818b0b20a2d7e0276596205366e1
This commit is contained in: