Merge "Merge latest API into single file before checking compatibility" into...

Merge "Merge latest API into single file before checking compatibility" into main am: d4e030c9 am: 77f1143b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3342493



Change-Id: I786c2cb02f872f390e715b5d5f78648556fbd4af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>