Refactor setCurrentFunction and setUsbDataUnlocked into one method
am: a291336bd8  -s ours

Change-Id: I60a407b71c4fbf4b5bd0ef980c08af8a4aa68f20