Merge changes Ie9c8934d,Iea747394

* changes:
  Create "android" backup agent in the system process for all users
  [Multi-user] Pass userId on backup agent creation