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

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

Change-Id: Ia01df8e4f716558c184e8be89f6a57eea95a149c