Merge "Revert "Re-land removing RECOVERY_AS_BOOT check for init_first_stage"" am: d939aa2405 am: eafdcd0b27 am: a7ac810749 am: 606ba34bf6

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

Change-Id: Idd35c90b3448b300e93d6f87a5874aeb6c43451e