am cc4c2c72: am 47e9b148: Merge "Trust: Track separate user has authenticated...
am cc4c2c72: am 47e9b148: Merge "Trust: Track separate user has authenticated since boot" into mnc-dev
* commit 'cc4c2c72':
Trust: Track separate user has authenticated since boot