Merge "Launchers that don't support managed profiles cannot be selected" into oc-dev
am: 535533680f

Change-Id: I9058ae475e16c3b3c3227aa979af78c8958d0628