Merge "Merge "Have GrContext hold a strong ref to VulkanManager" into udc-dev...

Merge "Merge "Have GrContext hold a strong ref to VulkanManager" into udc-dev am: 2a3fda26 am: 3259050c am: 00d67dae" into udc-qpr-dev-plus-aosp am: 2bfc0394

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



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