[automerger skipped] Merge "[aapt2] Generate @FlaggedApi annotations" into...

[automerger skipped] Merge "[aapt2] Generate @FlaggedApi annotations" into main am: 5f951b7f am: 5fe48781 am: ca14f255 am: acc50fd8 am: 745a97fb -s ours

am skip reason: Merged-In I0739f888d40269915c0acea5650c386da1a1782e with SHA-1 6fa7a3c7 is already in history

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



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