[automerger skipped] Merge changes from topic "composer-final-integration"...

[automerger skipped] Merge changes from topic "composer-final-integration" into sc-dev am: 0fdcbb8c am: 1f823eb0 -s ours

am skip reason: Change-Id Ie171c8f978db7de30e81800c464b2bd68aff73f8 with SHA-1 0af0cdb9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I717ef1a16c66740c5e4d42dd472c0333d4c04189