Merge changes from topics "cc-composing-update", "cc-merge-equals" into sc-dev...

Merge changes from topics "cc-composing-update", "cc-merge-equals" into sc-dev am: 5d422575 am: 3a318f5e

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

Change-Id: I930ae5311a3b1d1aa31a23fe12e50517ecfcf017