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

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

Change-Id: Id5efca28bb74c11167094143ca0a1a7c286fe54d