[automerger skipped] Merge "rename renounce fine location data" into tm-dev...

[automerger skipped] Merge "rename renounce fine location data" into tm-dev am: 463a4c72 am: 1035a682 -s ours

am skip reason: Merged-In Ic2ce84f51bf394031903ae180788216cfa910fc0 with SHA-1 065b77df is already in history

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



Change-Id: Idbcf69e602a7322cfb58732dee480ec247d03ebf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>