Merge changes from topic "unstructured_parcelable_macros" into main am: ca340b1f am: ee12a1ee

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



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