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

Merge "[automerger skipped] [DO NOT MERGE] Fix regression for enter PIP when onUserLeaveHint am: 15bcf9d7 -s ours" am: 84b6c4ac -s ours am: 7d9c9187 -s ours am: d18d3172 -s ours am: abd3297a -s ours am: 44b0945d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I983474c8704c4a96628e678bfbc379b77030aca2