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

Change-Id: If54d684e5e64e48ffc016bf848cf7db227c473df