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

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

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