[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: fe3ce66c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9d48855025c9161ced17733eaaa81c6bdac55401