Merge "trusty: keymint/gatekeeper: Pass device name from init scripts" into main am: 9ec007acf4 am: f2d6acf081

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2779372

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