Merge "Provide calling package name in cell info APIs" am: 5c365f9b54
am: f040f78303  -s ours

Change-Id: Ia62560a2bd59edee436ee71338495e45d50b68be