Merge "Suppress "UnflaggedApi" lint for @TestApi." into main am: cdf207b2...

Merge "Suppress "UnflaggedApi" lint for @TestApi." into main am: cdf207b2 am: d5d3d8c7 am: 4c402df9

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



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