[automerger skipped] Merge "make CallerInfo a systemAPI" am: 45aba1719c am: 18a432587c am: aed4594af5
am: c3b101e7c9 -s ours
am skip reason: change_id Ic3a5a6267aa0530dd85c6b0bd4221bba96dc73d1 with SHA1 00a18c5e4d is in history

Change-Id: Iedcd2beb67c105d03f48a023f2a12f872b19610a