Merge "USB: [API feedback] Add bitmask @IntDef annonation to setCurrentFunctions" am: 2f9800a47d am: 65de31ca5d am: bac02c1de2

Change-Id: I3dd8104d264a423b19ccfe8affc4a2f4de58b101