[automerger skipped] Merge "Annotate some data classes with @Keep." into main...

[automerger skipped] Merge "Annotate some data classes with @Keep." into main am: 84a49337 am: 8eb5c377 am: 0e71890d -s ours

am skip reason: Merged-In I21c0298a088092cef148253be3efed65e01a90d2 with SHA-1 cb279f32 is already in history

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



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