Merge branch 'security-aosp-qt-release' into int/10/fp2

* security-aosp-qt-release:
  Do not set default contactless application without user interaction

Change-Id: Ifda5a8a44639c6dc6534bba1f439acb0f3d11c94