Merge "Update ShaderCache to support shared locking" into udc-qpr-dev am: c57dc987

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



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