[automerger skipped] Merge "DO NOT MERGE StorageDumpsysTest allows charger off on USB connection" into oreo-mr1-cts-dev
am: 04def7709d -s ours
am skip reason: subject contains skip directive

Change-Id: I52d7851aad46df5443a1dd6faedd7f50b47d7553