[automerger skipped] [automerge] [DO NOT MERGE] Fix regression for enter PIP when onUserLeaveHint 2p: 0207f039d2 am: d6271d42f4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I51d85a135117ef0ddc9b922eac6ceaaa19d346b3