Merge changes I1694c0c0,I8db75951

* changes:
  WifiStack: Use public API to get UserManager
  WifiStack: Stop using UserHandle.getUserId()
tree: cbbf5395994e69f55868112f4f54fa60d62c6a7f
  1. service/
  2. PREUPLOAD.cfg