Merge "Ensure at most one pip-dismiss-overlay" into sc-v2-dev am: de8bc925fd am: 9348526c18

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

Change-Id: Id158c5695d036356191c7654daeeaad08d7ed123