Merge "Fix dismiss ciricle being behind expanded view" into sc-dev am:...

Merge "Fix dismiss ciricle being behind expanded view" into sc-dev am: 563e1b48 am: a652e224 am: 6f8b7393

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

Change-Id: I242e61f13b83d2eee0cf5889ae1d536c210983da