[automerger skipped] Merge "Location provider check for subattribution" into...

[automerger skipped] Merge "Location provider check for subattribution" into tm-dev am: 6f73905c -s ours

am skip reason: Merged-In I7240db08025d801eb537234ca95aeb17c3f302f2 with SHA-1 578b661b is already in history

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

Change-Id: I74f09e14de3bc0c6bb745ac0925b0c2aad5e9f13