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