Merge "Merge "Allow resume of parent activity that launches PiP" into qt-r1-dev am: 2c89115cb7 am: eaf0683981" into qt-qpr1-dev-plus-aosp