Merge "Fix Location equals()" into sc-dev am: b42181c3 am: 81321095 am: 9f13df4f

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

Change-Id: Ia80693d67b5dbf762649e72175d87de60b30b023