Merge "make callerInfo a systemAPI" am: 39e6e99308 am: af07c1778e
am: 67a6dfce4d

Change-Id: Ie3cecc1aab739a5200091a16cb0210d49b85f806