Merge "Add System Properties based settings for USAPs" am: a2143c07 am:...

Merge "Add System Properties based settings for USAPs" am: a2143c07 am: 6cb0a4dd am: ca5df431 am: 8b193879 am: 80f33ec0

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



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