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

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



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