[automerger skipped] Merge "Fix possible leaks in CanvasContext...

[automerger skipped] Merge "Fix possible leaks in CanvasContext HintSessionWrapper" into udc-qpr-dev am: dc2ea290 am: aaa8951a -s ours

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 ac620f64 is already in history

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



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