[automerger skipped] Merge "Add INFO_MODEL and INFO_MODEL_YEAR default values"...

[automerger skipped] Merge "Add INFO_MODEL and INFO_MODEL_YEAR default values" into rvc-qpr-dev am: 0e2072ce am: 76907bbf -s ours

am skip reason: Change-Id Iff9f763aa624a2002b0dd326316410a93a47d5c0 with SHA-1 5aa08b7d is in history

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

Change-Id: I4295cb621324a4cf922ef25767137df6413add78