Merge "expose callerInfo to systemAPI" am: f71573ff24
am: fd26d00178

Change-Id: Ib8fe295cf72d390c35a17fb6a3b2f3166fe25f5e