[automerger skipped] init: introduce ro.kernel.version property am: 1c496e94...

[automerger skipped] init: introduce ro.kernel.version property am: 1c496e94 am: 2d64b0ca am: 528b0f67 -s ours

am skip reason: Merged-In Icec640b8a7150b344d9aa3bc0bdbcdae050c7c45 with SHA-1 1e966fa9 is already in history

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

Change-Id: Idc0d16571782bff66891892675b44a8ba742e4cd