Merge "Continue the pausing process after automatically entering pip" am: d88101f7a4 am: 343e36ebe7 am: ede512d476

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

Change-Id: I8186e46beddbec25bf8ba411b0eff60773643fd1