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