Merge "Prevent audioflinger battery notes leak" into udc-qpr-dev