Merge "Add null checks to NotificationListenerVerifierActivity." into lmp-dev