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