Merge "Merge remote-tracking branch 'aosp/upstream-master' into HEAD" am: 340853027b am: 0e7ad30895 am: 4c63dcff82

Original change: https://android-review.googlesource.com/c/platform/external/arm-trusted-firmware/+/1824194

Change-Id: Id713ab5798e7dff3e9b7fce229d48e16fb4410b6