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

Change-Id: I8038f06a7cddc83fbddfeda8598106b1dc3496b3