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

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

Change-Id: I4ceaa3074c9b33d5b9c61baebc3e41dc6d8aa5c7