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

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

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