Merge changes from topic "death_recipient_flag" into main am: e916262ee7 am: bbe1f9da3d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2761566

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