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

Change-Id: I6afed671bee7035478ce05bcbf69bb0a355f5d09