Merge "[automerger skipped] [DO NOT MERGE] Fix regression for enter PIP when onUserLeaveHint am: 15bcf9d7bd -s ours" am: 84b6c4ac8b -s ours
am skip reason: Merged-In Ib28651f5c4dc728d19f968adc56015836e307ef8 with SHA-1 7cb001fda4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17062085
Change-Id: I9893b7fa2ba016cedc390bf2b78b646597735264
This commit is contained in: