[automerger skipped] Merge "Revert "Handle "hardware" bootconfig parameter as "androidboot.hardware""" into sc-dev am: 3cc7a0c5 am: 5e4a18ff -s ours

am skip reason: Merged-In I0e436a27730d20689bc6974562c3e88d744385db with SHA-1 86ec18bc is already in history

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

Change-Id: I62f121a904b0dd38faf620853db1f5c6d1d09965