[automerger skipped] Use read-write lock to guard property config. am: acd65a80a9 am: d1ab2e86e0 -s ours

am skip reason: Merged-In I0df79040c363e66baab48631f457752532d2967d with SHA-1 35401eb1ba is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3279799

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