[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: 273e774f -s ours am: 9fb2f307 -s ours am: 49fa0964 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6d952f33dd2f5fea16356bd9c11964f080e34b5a