Merge "[automerger skipped] Merge "init: skip RejectsCriticalAndOneshotService...

Merge "[automerger skipped] Merge "init: skip RejectsCriticalAndOneshotService for devices launched before R" into rvc-dev am: 8272339d am: 62de73ae am: 4b125626 -s ours" into rvc-qpr-dev-plus-aosp am: 3223244b -s ours

am skip reason: Change-Id I2353bfa7f598bd19ba57498cc5bbad7a3ed34707 with SHA-1 5c8457ef is in history

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

Change-Id: I597f33b1dd140962d4977632c925127a3035ba3d