Merge "Add System Properties based settings for USAPs" am: a2143c07bb am: 6cb0a4dd92

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

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