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

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

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

Change-Id: Ide9104a08c6082ab44c73935b8544aa2b08882d8