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

Change-Id: Ia17d9c4dbd4f3a7fc21fda1b318bb3c27b3debdb