Merge "Collapse bubbles when drag and drop is initiated" into tm-dev am: ef1cc8850f am: 4437048f1a

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

Change-Id: I0407669dd09567eb74318522d1ec8faa66dab63f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>