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

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

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