[automerger skipped] Merge "Remove android.graphics.RecordingCanvas.drawMesh(...) from current.txt" into main am: f60036a99c am: 1f2d60ff0d -s ours

am skip reason: Merged-In I7e23b93659a87f13606ca2d6c4c3ceebee23901f with SHA-1 cf7ff527cf is already in history

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

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