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

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

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