Merge "Update for PropertyWatcher API change." am: b7c91fc819

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2583177

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