[automerger skipped] Fix tests broken by @NonNull annotation fix am:...

[automerger skipped] Fix tests broken by @NonNull annotation fix am: eb1f7927 am: 6ac88517 am: befddd5a -s ours

am skip reason: Merged-In I0ff1ce3200f73c5596e1f06ea653ff397b9024cb with SHA-1 8cb2bb51 is already in history

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



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