Mark tm-qpr-dev-plus-aosp-without-vendor@9129937 as merged am: bef081324a

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

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