tree d664b524a20019229288741f3db9d72bfb92e9fb
parent 8b8ab7854c278008b8333a2dad3a381da58c9967
parent 2e63aaf616cdda26019d265989bd0d96ee11aab9
author Jason Macnak <natsu@google.com> 1626186604 -0700
committer Jason Macnak <natsu@google.com> 1626186604 -0700

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