Fix tests broken by @NonNull annotation fix am: eb1f79278a

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

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