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

Change-Id: Icdde072f471c1c5823235cb6608bcfc87b629325