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

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

Change-Id: I8fba8bea52466a988739d73e564dbdfa1521fa0c