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

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

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