[automerger skipped] Ensure objects remain valid after calling policy am: 7d7ac48 am: 8d8ffe0 am: 2ed2838 -s ours am: 0a8731b -s ours

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

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

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

Author: vishniakou