am 846fe415: am 77201b54: Rename UserId to UserHandle.

* commit '846fe415350bd0668f8a2190d1c78cf07c97ef60':
  Rename UserId to UserHandle.