Merge "rename renounce fine location data" into tm-dev am: 463a4c72

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



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