Merge "Migrate to get{Int,String}ForUser" into stage-aosp-master