Merge "Use a RwLock for DB_PATH" am: 8a9352625f am: 6bb76bbaa2

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

Change-Id: I7b6e94dde245650be356ef8dd5ca9ee0470b8cf0