Merge "Merge "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" into nougat-mr1-cts-dev am: 6fb9c17e15"
am: 2d179f3032

Change-Id: I3916a6ab9ccbb5d98eab6a8f52c5e8c74fe11c34