Merge "Merge "Exclude Charging Constraints test, if android.hardware.type.automotive is declared." into oreo-cts-dev am: 973977906b" into oreo-mr1-cts-dev
am: d38ada625c

Change-Id: I427a8b3cea7ae9dbf8051d378a9cd57c404098db