[automerger skipped] Merge "Expand @FlaggedApi(FLAG) constants in API...

[automerger skipped] Merge "Expand @FlaggedApi(FLAG) constants in API signature files" into main am: 779ebfb6 am: 0275f893 am: 48567b75 am: f50a02c3 am: 41b6aba2 -s ours

am skip reason: Merged-In I757c6e87d81768ef6095a4bea67c74c3ae6028a7 with SHA-1 01544b94 is already in history

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



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