[automerger skipped] Merge "Prevent session destruction on...

[automerger skipped] Merge "Prevent session destruction on CanvasContext::destroy()" into udc-qpr-dev am: 894168f2 am: 88855bd1 -s ours

am skip reason: Merged-In I209e40764d5bbcde85d709bccbc41f94f9c2ab49 with SHA-1 9f3654e6 is already in history

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



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