Merge changes from topics "cc-composing-update", "cc-merge-equals" into sc-dev am: 5d422575 am: d8d32044 am: 7f8954ba

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

Change-Id: I81f9bcc60b2d28ee0ea6869a7ed672119e7082c6