[automerger skipped] Merge "Compose beta bump" into androidx-main am: 06ba27a6a7 -s ours

am skip reason: Merged-In Ic7a12a22ae1c50c88f210589a304705014025863 with SHA-1 492c35ddd5 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/support/+/2593055

Change-Id: I3ea9c9cc579cef81887ab105934fed2f600fc839
Signed-off-by: Automerger Merge Worker <[email protected]>