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

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

Change-Id: I3d147fed71c603c690e6662fc70f733dae6216c6