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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2369e819042366f6ffa992853bfc14c5675cb6ad