Merge "Added AIDL for cell identity" am: 470ba9d471
am: a205f42172

Change-Id: I82ea2e0019e513a3404e8bde0cda6514203df7dc