[automerger skipped] Merge "nfc(api): Mark some data types as formal API for...

[automerger skipped] Merge "nfc(api): Mark some data types as formal API for mainline" into main am: 4eb41e2e am: 8febb9dd am: 48fd52ba am: 39f7bc63 am: 0887d3a7 -s ours

am skip reason: Merged-In Ib1f22395567386a6e802d78b6fe359f92c3847d7 with SHA-1 51c5d5ed is already in history

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



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