Merge "Keystore 2.0: Sync output format of generated headers" am: cfab4c08e1 am: 87ac3808d8

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1622544

Change-Id: I8d764396c26905adafc4d00f186dee1d399a999e