Merge "Launch to fullscreen when re-open from lockscreen and in PiP" into rvc-dev am: c99594ee88 am: 4212e337d7 am: 58808772e2 am: a7ad9f54a7

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

Change-Id: Ic7a3f0d0cd6028f1c09efe2a73fa578fc537e988