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

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



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