Merge "Enforce boot and vendor patch level format always" am: efd4cf71e5 am: 6cff83c776

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2441391

Change-Id: I72baa97cf1fe2347d6c66a024ab296bffa623674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>