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