Merge "Workaround launching PiP task with CLEAR_TASK & NEW_TASK flag." into oc-dev am: c5e289d479
am: d7ea7c4010

Change-Id: Ie44af4d3ca2c64fcf53c7ecfc817d80ff6734a32