Merge "Only onboard when launched through front door. am: 2d6d4d23a9 am: c34270d03d" into oc-dr1-dev-plus-aosp