Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method." into nyc-mr2-dev
am: 969db21744

Change-Id: Iafad63753409a5b3e0ff3866c95d140b3db6ebfc
tree: ec2d2a54aabb125a29d37b9c0ccc7f9c8ccd1ea8
  1. QuickSettings/
  2. Settings/