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

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

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