Merge "Handle onNullBinding" into rvc-dev am: ea90d380e7 am: 7f26a226d1

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

Change-Id: I3c227276df14c9157f58209bdeac934cf936b1ea