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: 7839a507" into udc-d1-dev-plus-aosp am: bb88d793 am: 53ad17d0

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



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