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

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



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