Merge "Merge "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 am: e92aa3b35b" into oreo-mr1-cts-dev am: c418f2cef0" into pie-cts-dev