Refactored setCurrentFunction and setUsbDataUnlocked into single method.
am: 4882496232  -s ours

Change-Id: Ia50fbb88cdaa9e3570b68798b82df609475b5fe6