Merge "Fix Location equals()" into sc-dev am: b42181c3 am: 07b2ff7a am: 0db8d619

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

Change-Id: Ic818e223dbbf4c893893f6947078095a0a43cf19