Revert "Revert "Merge remote-tracking branch 'aosp/upstream-master' into desugar""

This reverts commit 67e182a0a1c1d59b5fa107a42ba3bacdc7255eba.

Bug: 70415451
Test: m checkbuild
Change-Id: I87e967894b53b0f18defc48868e4e3b8181ddd33
8 files changed