Merge "Exclude Charging Constraints test, if android.hardware.type.automotive is declared." into marshmallow-cts-dev
am: 06971fee3e

Change-Id: I088563209164dc6ecd4e2d75a35611af92d81805