[automerger skipped] Merge "Change package of CallerInfo" am: 4a1ef4a01f am: d16644e69e
am: 2cb6b267a2 -s ours
am skip reason: change_id I3d3bb61570e53aa2e6a288b7ca52d517c89caf66 with SHA1 91b5372492 is in history

Change-Id: Ie0249df5f62ac64b9b9d08ac04f8c785ad30602b