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

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

Change-Id: Icd2dc378c5780b64f5e0b1374755096220c786b4