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

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

Change-Id: Ifc30e551ddbb777d3fdd9c30df3b060217865983