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

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

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

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

Author: vishniakou