Merge "Add isAutomotive and isVrHeadset to device-side FeatureUtil" into pi-dev am: d05b8b8bc8
am: 2c7d529b75

Change-Id: Ibd4635c56da3325048a340c7a2046a8ea57d4400