Merge "Suppress compose compiler error for default value" into main am: b1fc4c3ac6

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

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