[automerger skipped] Merge "DO NOT MERGE Add INFO_VIN to DefaultConfig.h for...

[automerger skipped] Merge "DO NOT MERGE Add INFO_VIN to DefaultConfig.h for CTS tests" into tm-qpr-dev am: 1c81f278 am: 45b7ef51 -s ours

am skip reason: subject contains skip directive

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



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