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

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

Change-Id: Ie6fe3329847f882af3dae22366e786423fd2a546