Separating key header policy and metadata am: 44cdcc9cb4

Original change: https://android-review.googlesource.com/c/trusty/app/sample/+/3207346

Change-Id: If1413a47b285fc8cb7ba69714ea70336649dfa5a
Signed-off-by: Automerger Merge Worker <[email protected]>