[automerger skipped] Merge "Revert "Handle "hardware" bootconfig parameter as "androidboot.hardware""" into sc-dev am: 3cc7a0c5 -s ours am: 52b10f79 -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: Ib1b94a9649e2d4a23c6db05fa39a1bdc4f13aa00