[automerger skipped] Merge "Suppress compose compiler error for default value"...

[automerger skipped] Merge "Suppress compose compiler error for default value" into main am: b1fc4c3a am: 5a3112a1 -s ours

am skip reason: Merged-In Ia6ca034c8c7a7d6306f66bd3f0d9f29c9c62edbc with SHA-1 49870c4a is already in history

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



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