[automerger skipped] Merge "Fix APS death notification" into rvc-qpr-dev am:...

[automerger skipped] Merge "Fix APS death notification" into rvc-qpr-dev am: 3195a132 am: 23daf99c -s ours

am skip reason: Change-Id If24c59ec3e3d01f418fbf575b8cc32ae0ba7fa2e with SHA-1 d9f8283b is in history

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

Change-Id: Ibd82729551e3912b65d1ab4f9244073911ea5021