Merge "Support appending vbmeta digest to id/fingerprint" am: 57b9a537 am:...

Merge "Support appending vbmeta digest to id/fingerprint" am: 57b9a537 am: 8b6d8810 am: 4e83aa5b am: 87eeec4d

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

Change-Id: I5c160fa47b97d0038e10a779f604d687e5138455