Merge "Remove VehicleApPowerStateConfigFlag comment." am: 336bba076f am: 6acd292bf5
am: 7467de0d4d

Change-Id: I4d23ea4066ad6a398efde3f9f1a65807b284a37e