Merge "Added AIDL for cell identity" am: 470ba9d471 am: a205f42172
am: e8f6d7cc27  -s ours

Change-Id: I6f67650af967bd280bf5509bd30ed1655dcd3680