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

Change-Id: I597c9c8cce298e6a903fa8b1e105ab5e1f013fa4