Ensure objects remain valid after calling policy am: f68fc4c575 am: ea84cd2a1c

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

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