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

[automerger skipped] Merge "init: skip RejectsCriticalAndOneshotService for devices launched before R" into rvc-dev am: 8272339d am: 62de73ae -s ours am: cd958093 -s ours am: 1a4cc798 -s ours

am skip reason: Change-Id I2353bfa7f598bd19ba57498cc5bbad7a3ed34707 with SHA-1 0e40ba31 is in history

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

Change-Id: I1dc4659ed8178c56598b9816d5255986f4ec15ac