Revert "Revert "Revert "Merge remote-tracking branch 'aosp/upstr..."

Revert submission 3196210-bcupdate2

Reason for revert: Reverting until we figure out a plan for minimization breakages like b/356844860

Reverted changes: /q/submissionid:3196210-bcupdate2

Change-Id: Id33515cadc45a3321600ada1ad333cf162e4fca2
1489 files changed