[automerger] Merge "Teach charging job constraint tests about no-battery devices" into marshmallow-cts-dev am: 11ef468f am: 46ad34ea am: 2480e3a1 Change-Id: If8ef14c785aff1d6e252665e0a2223346494db2a