Merge "Disable onboarding on P devices" into pi-dev am: 6c44f1aa35
am: 9f55b13685

Change-Id: I836f91d488e3c88d4f9b6dd5f2acf6b012db8647