Merge "Fix issue with non-focusable PiP activities being resumed." into oc-dev
am: 68cf1b8848

Change-Id: I7d20aeebb7e1a1e6485cc22a8e18ca3c4ab35c3d