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

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

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