Merge "Call the scrim unlock callback when transitioning to BUBBLES_EXPANDED." into rvc-dev am: 928625a8b5

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

Change-Id: Ia4cb1e96b55a8cdfd7ca191aaaa6e53323f33bea