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: I83a51b5184209f0b0aa1d1288b3d124e46eb9c56