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

Change-Id: I20eb8e4fa82a80d86f324fd95f0392c914c961c4