tree 8b5534b311a50af8585c2f956fb309c527cc3dcb
parent 41a6c77505ba14d125114fa1ff1771f9c3e60398
author Jihoon Kang <jihoonkang@google.com> 1697185274 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> 1697204956 +0000

Merge remote-tracking branch 'aosp/metalava-main' into 'aosp/main'

Merge performed by:
  scripts/merge-from-metalava-main.sh

This merge includes a number of changes so this contains a list of all
the affected bugs.

Bug: 298052340
Bug: 299048934
Bug: 302579866
Bug: 302654813
Bug: 303787736
Bug: 303842244
Bug: 304226685
Bug: 304503426
Test: m checkapi
(cherry picked from https://android-review.googlesource.com/q/commit:51c3353bb95eedced2ec230c44f8ab5dcd690a72)
Merged-In: I3da9b00ba29ff97155038adf21c3b59e6c2271d3
Change-Id: I3da9b00ba29ff97155038adf21c3b59e6c2271d3