Merge "Update ro.vendor.api_level for non-GRF devices" am: 075b6d725e

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

Change-Id: Id9a5e81b98829ea886a374276d4b5be4ac0b4142