Merge "Use correct call to get Android user ID"
am: 91fc4caa02

Change-Id: I9a86af493af6bdd369609a53da46e77ca02f77a5