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

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

Change-Id: I3be9c44e07194c9c317677fe33e9dc1568548783