Merge changes from topic "floating_dismiss" into tm-dev am: ba688138

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

Change-Id: Id5c49d8b371722169a7cdfc673e2701a8d964d8a