Merge "Launch to fullscreen when re-open from lockscreen and in PiP" into...

Merge "Launch to fullscreen when re-open from lockscreen and in PiP" into rvc-dev am: c99594ee am: 4212e337 am: f0274aac am: 7d27fd4c

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

Change-Id: I9cfc95c86e0bf022a22e26f7e431029d4864dc5f