[automerger skipped] [DO NOT MERGE] Fix regression for enter PIP when...

[automerger skipped] [DO NOT MERGE] Fix regression for enter PIP when onUserLeaveHint am: 15bcf9d7 -s ours am: 602807d6 -s ours

am skip reason: Merged-In Ib28651f5c4dc728d19f968adc56015836e307ef8 with SHA-1 0207f039 is already in history

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

Change-Id: Icc98d334cb014cf7989b05a905da82a6b1c5357c