Merge changes I971a63b9,Ic64cac06 am: 43a934af31 am: 095d164b14 am: 96433df6a3 am: b22e21ad8c am: a005f1cec5

Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/2563552

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