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

Merge "Merge "Fix Location equals()" into sc-dev am: b42181c3 am: 81321095 am: bf93994c" into sc-v2-dev-plus-aosp am: 5301f464

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

Change-Id: I85f27bde856a433777fced1452c12f755039815f