Merge "Merge "[Cherry-pick] StorageDumpsysTest allows charger off on USB connection" into pie-cts-dev am: a60d31174d"