Merge "Temporarily remove @Nullable from findViewById(int) methods" into main am: a8da8e6cca

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

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