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

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

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

Change-Id: I477d63d3591fca70a3a3ad488af50855c4c484b3