Merge remote-tracking branch 'aosp/upstream-main' into 'aosp/master'

... to pull in crrev.com/c/3015656 to handle potential allocator
service startup failures for Cuttlefish.

Bug: b/187802138
Test: launch_cvd
Change-Id: Ibf547f86bda0046cafa6eb273c507a81954e9a88