Merge "Define ro.vendor.api_level" am: 0a671e24f5

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1839954

Change-Id: Ic9f2dced1b547ec2f83c5fd8c791193781473961