Merge "Remove unused CellLocation" am: 1621ada259 am: 9b35974457 am: ca32d8f9a2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id552bb806b01d0195f340016dc7b77707d4942e8