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

Change-Id: Ic4169ce26457f32e8451b09784520656fc60ba4e