Merge "DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager" am: 22f4a681f9  -s ours
am: 1ac5184053

Change-Id: I9dc40770783686b9b3db57275c8a1bbab97a7a9a