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

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

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