Merge "Merge "Track current user without calling into AMS." into nyc-dev am:...
Merge "Merge "Track current user without calling into AMS." into nyc-dev am: 90f4ca78 am: e43fb2e5" into nyc-mr1-dev-plus-aosp
am: ebf34747
* commit 'ebf34747':
Change-Id: I38755c49787b6abc8733e3f26eaaaa58e0e74ce5