Merge "Choose opaque activity for fixed rotation with entering pip" into sc-v2-dev am: fd566b80

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

Change-Id: I6489c88e228d475a0d0a6b1ded76c689c76bb4b1