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

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

Change-Id: I377f93971cc462840261a50d1cd2109376b29c1d