[automerger] Merge "Teach charging job constraint tests about no-battery devices" into marshmallow-cts-dev am: 11ef468f21 am: 46ad34ea08

Change-Id: I19c0200ee0104aa6e3faab6ddee2b8bdd3b3fa26