Merge "Merge "Have GrContext hold a strong ref to VulkanManager" into udc-dev am: 2a3fda26ee am: 7839a5078c" into udc-d1-dev-plus-aosp am: bb88d79397

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

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