[automerger skipped] Ensure objects remain valid after calling policy am: f68fc4c am: bd76e88 -s ours

am skip reason: Merged-In Ibea7117e4c85cd1e98bbd01872ce249cbb2d54bd with SHA-1 f50323a is already in history

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

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

Author: vishniakou