Merge "[DO NOT MERGE] Replace UserHandle.CURRENT with UserTracker" into tm-qpr-dev