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
am: 9121a1dcd7

Change-Id: Ic743ba992f19aa5765360508498dc871b328e1f8