Merge "usbd: Exit in case of charger mode." am: 8c63ef828a
am: 7fee79550d

Change-Id: Ib230992ebb7210ee9df5edaf5b67341bcf4da0f1