Merge \"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\" into nyc-dev
am: 159c13801b

Change-Id: Ic83a0ae31afac6b94fcfba8ceee986326fb300ab