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

[automerger skipped] Merge "Fix possible leaks in CanvasContext HintSessionWrapper" into udc-dev am: a7a99191 am: 55d09197 -s ours am: b6d36b02 -s ours

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

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



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