Merge "Support appending vbmeta digest to id/fingerprint" am: 57b9a5370e am: 8b6d881071 am: 4e83aa5beb am: 87eeec4d40

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

Change-Id: I5c160fa47b97d0038e10a779f604d687e5138455