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