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

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

Change-Id: Ifb6f6c79465aa90b25fdc569f53143b51af70264