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

* security-aosp-qt-release:
  Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation.

Change-Id: I2b18360dee511f198743511c80f6099a685a6b20