Merge changes from topic "b/121448199" into pi-dev

* changes:
  Make sure mCurrentUsbFunctionsRequested flag be updated currectly
  Check for preexisting flag before enabling the gadget