[automerger skipped] Merge "Do not use hidden API...
[automerger skipped] Merge "Do not use hidden API UserManager.hasUserRestriction" am: e7cddc8f am: 82ebfcca am: 460c2478 -s ours
am skip reason: Change-Id I53d8003787a6e0903d3512b545ad61248d387c87 with SHA-1 5e6de455 is in history
Change-Id: I641e59a4b2d832b8ec621eaf1f20570cb15f7580