Merge "Fix NullPointerException in...

Merge "Fix NullPointerException in android.widget.TimePickerSpinnerDelegate.updateInputState" into main am: 2b66ca61 am: 1b1652d4

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



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