Merge "StorageDumpsysTest allows charger off on USB connection" am: 993c6b8e33
am: c79bf3f9b0

Change-Id: I2c79971827e366e0c607a362f23f595affe6b7aa