Merge "Add isAutomotive and isVrHeadset to device-side FeatureUtil" into stage-aosp-pi-cts-dev