Merge "Fix race while setting ASyncNotify callback" into tm-qpr-dev am: a9c774f641

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

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