Merge "Fix possible leaks in CanvasContext HintSessionWrapper" into udc-dev am: a7a99191cc am: 55d091974b

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

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