Ensure objects remain valid after calling policy am: 7d7ac480 am: 8d8ffe01

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



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