Merge "Merge commit 'a1f02f4f3daae7e21ee58b4c93ec3e46b8f28d15' into HEAD" am: 8ba9013f30

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

Change-Id: I2f41a3f8a09c572975e9fec690d4adcccf1016f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>