Merge "Merge "Fix misplaced surface from fold -> unfold while bubbles are...

Merge "Merge "Fix misplaced surface from fold -> unfold while bubbles are expanded" into udc-dev am: f9be5327 am: 20407d8a" into udc-d1-dev-plus-aosp am: 2ef61740

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



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