Merge "DO NOT MERGE StorageDumpsysTest allows charger off on USB connection" into oreo-mr1-cts-dev