Merge "make CallerInfo a systemAPI" am: 45aba1719c
am: 18a432587c

Change-Id: I39e731e7895fd1e602dd82ce495180aa45ddebbe