Merge changes from topic "death_recipient_flag" into main am: e916262e

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



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