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

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

Change-Id: I94be25db11a625567708bb6a372c7e7be0d65591