Merge "make callerInfo a systemAPI"
am: 39e6e99308

Change-Id: Iaaa3ba55e02660a0b0c87db27e6cec06d43153fd