Merge "Fix APS death notification" into rvc-qpr-dev am: 3195a1323f

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

Change-Id: I4489afb840023ea2f4697688100ba829a5558059