[automerger skipped] Merge "Callback behaviour change for...

[automerger skipped] Merge "Callback behaviour change for CONFIGURE_FLAG_USE_CRYPTO_ASYNC" into udc-dev am: 29b9e601 am: 0c34c6da -s ours

am skip reason: Merged-In I316373c450e5badde408ffbafbdefa3fa482808f with SHA-1 634d0800 is already in history

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



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