Merge "Use ReentrantReadWriteLock in the compat framework" into sc-dev am: a800c7eee4 am: d972a4a890 am: 8a79607b61

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

Change-Id: I6e141aca4ec992795df97890010a22af22011e60