[automerger skipped] Merge "make CallerInfo as SystemAPI" am: 7e902363a6 am: 3f1055a2ba am: 610244cd4f
am: 43bd6f2ffc -s ours
am skip reason: change_id Ie95897c77e97e40f5357c107aede82edfea44d5a with SHA1 b9a1eefec6 is in history

Change-Id: I51b3e747248836cbfdf6a1075ad277b82dbcc4a7