Merge "Do not populate `ro.kernel.` properties in init" am: 5e89a35ae3 am: f7c4f3b94b

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

Change-Id: I8997fe63eea81365093a40478e130410b4cc8d35