[automerger skipped] Merge "PiP: Move tap-outside-hide block one level higher." into sc-dev am: 395c582b -s ours

am skip reason: Merged-In I810a0825a96224b395dde7d51df077fed996c3ff with SHA-1 3892e8e0 is already in history

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

Change-Id: I708fe00be5c1211bf20f6d7248bc7f3c643b3825