Merge "Check condition presence before updating callbacks." into tm-qpr-dev...

Merge "Check condition presence before updating callbacks." into tm-qpr-dev am: dfc5118d am: dedd662b

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



Change-Id: I3676505bd5991ed6252c69bc025f4cbffa519a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>