[automerger skipped] Merge "make callerInfo a systemAPI" am: 39e6e99308 am: af07c1778e am: 67a6dfce4d
am: bacfcd2aa9 -s ours
am skip reason: change_id Ie4a6dbb16f6c4ed327134c1cb7579836ddba5d35 with SHA1 522943d201 is in history

Change-Id: I9027a82aed8a9f1a8c3fc86edca78193a39214aa