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

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

Change-Id: I546c35979cf7d6137895b22abbd40c05ba0cdc40