Merge "Merge "[automerger skipped] Merge "Teach charging job constraint tests about no-battery devices" into nougat-cts-dev am: b4dc354f62 -s ours am: 88bc9c6d27" into oreo-cts-dev