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

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

Change-Id: Iaf34303cb7d368d58a2feb730b2bf64220078e01