Merge \"Frameworks/base: Refactor UserHandle and Environment a bit\" into nyc-mr1-dev
am: e6fcebbf50

Change-Id: Ib6be1e72ad9b0350256ec208c6aee051b746f9d0