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

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

Change-Id: I7add5df8a6b32f0ddb0881f4dc4ba0acefed09c7