Merge "Resume appSwitchesAllowed after exit PiP" into sc-v2-dev am: 1ba4fcf076 am: ca575350ed

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

Change-Id: I50f5309338221925a55cf308e9362c3d117589bf