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

Merge "Enforce boot and vendor patch level format always" am: efd4cf71 am: 6cff83c7 am: 68334663 am: dd9febd1

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



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