Merge "Annotate some data classes with @Keep." into main am: 84a49337 am: 8eb5c377

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



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