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: 8a31e5b9" into udc-qpr-dev am: 118aec1e

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



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