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: 751c2669 am: 17744ff0

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

Change-Id: Id25f2095328ad3e4254949bd58303e64aa9bd9f8