Merge changes from topic "unstructured_parcelable_macros" into main am: ca340b1f0a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2906637

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