[automerger skipped] Merge "Migrate to get{Int,String}ForUser" into...

[automerger skipped] Merge "Migrate to get{Int,String}ForUser" into stage-aosp-master am: b40240bd am: 5119ed18 am: e4393785 am: 8e910107 -s ours

am skip reason: Merged-In I2543be4737a30222284ee75c709419da0d409667 with SHA-1 5731002f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19129306



Change-Id: Ib4816c0822fbc0f2faa253933ca9bc272a5804aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>