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

Change-Id: I0f576f8e44181e80768873aa27a4dfde6535a62c