Revert "Revert "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message""

This reverts commit 5e75078a5d6204a81c44e9beebce1c60b3244d16.

Patch was re-included again for the 2021-11-01 SPL.

Issue: SEC-2845
Change-Id: I08c498155ebc2b29dc5d2daac86ce6846925b55c
3 files changed