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

[automerger skipped] Merge "init: skip RejectsCriticalAndOneshotService for devices launched before R" into rvc-dev am: 8272339d -s ours am: da0fcc19 -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: I244edcfb96384ad159dc37e3b2471e5a8fed1b76