Merge Trusted Firmware-A v2.9 release am: d7e587b1d2

Original change: https://android-review.googlesource.com/c/trusty/external/trusted-firmware-a/+/2634065

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