[automerger skipped] [DO NOT MERGE] Fix regression for enter PIP when onUserLeaveHint am: 15bcf9d7bd -s ours am: 273e774f51 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1cb76198d176022a43b8e96ea459216bbe55588c