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

[automerger skipped] Merge "Fix possible leaks in CanvasContext HintSessionWrapper" into udc-dev am: a7a99191 am: 50b9de5f -s ours am: e1c1bf45 -s ours am: 8b680e6b -s ours

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

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



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