Merge "Handle onNullBinding" into sc-qpr1-dev am: b785d6d94e

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

Change-Id: If6c00f5efc44772f1ca697bd527d11cada5203e3