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 am: fd60d07feb am: 4f18358c4e am: ebd566011e am: 016636b378 am: 3f454f6246
am: 610eb4e7d2

Change-Id: I8d3dc65b02685c3849401ef5185ea59a49284933