Merge "nfc(api): Mark some data types as formal API for mainline" into main am: 4eb41e2e89

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

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