Merge "Update configuration with broadcast" into tm-qpr-dev am: 9ab87d8b am: 7d1a2503

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



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