Merge "Remove unused CellLocation" am: 1621ada259

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554022

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0efa3051f04d3d040da58eb09a297221c53df11