Merge "Add missing @NonNull to BaseRecordingCanvas" into main am: 5f3605201b

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

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