Merge "make CallerInfo a systemAPI"
am: 45aba1719c

Change-Id: Ibf747aaa59a9a1560d75ef581b9e4c37557589c1