[automerger skipped] Merge "Teach charging job constraint tests about no-battery devices" into nougat-cts-dev
am: b4dc354f62 -s ours
am skip reason: SHA1 b4dc354f62 skipped by user rossyeh

Change-Id: Ie6227d483875de41ffc4ac7efe5ab76400712885