Merge "Prevent audioflinger battery notes leak" into udc-qpr-dev am: 39d8386e

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



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