[automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into rvc-qpr-dev am: 9c105d911a
-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: Id5025c35217126e88af7d100fff6960699d3ae94
This commit is contained in: