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

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

Change-Id: I87d37e714a578f0bfe343c7cd07b36d7f8221fa8