Merge "Fixing issue with PiP settings not showing apps for other profiles." into oc-mr1-dev am: 625b1dd13a
am: 078d01c8c1  -s ours

Change-Id: I1e35d654d43011911b9fb92d15e78ccd04b6eb0b