Merge "Merge commit 'a1f02f4f3daae7e21ee58b4c93ec3e46b8f28d15' into HEAD" am: 8ba9013f30 am: 891b338b84 am: 82e7567d7d am: f85d3c275b

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

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