Merge changes I79ba54d7,I224fb4b6 into lmp-dev

* changes:
  Make UsageStats API default on only for the system
  ActivityManager shouldn't return null for getCurrentUser