Merge "Handle onNullBinding" into rvc-dev am: ea90d380e7 am: 13d4bf3b81 am: 7fc85cd4ac

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

Change-Id: I7143049d12c84c7ab349a1a085a69a81b103e6f9