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

Change-Id: I2c6c65c9e1445e02c8e0e264090cbb4d62295d39