Merge changes from topic "sticky_placeholders_custom_finishing_behavior" into...

Merge changes from topic "sticky_placeholders_custom_finishing_behavior" into sc-v2-dev am: d2fceab0 am: d4e9e66e

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

Change-Id: Icc6133f34b5a7f24e0a29c545d096fd24aa2b132