Merge "Use const refs to strings in PropertyProvider" into udc-dev am: ee66b97fa5

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

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