[automerger skipped] Ensure objects remain valid after calling policy am:...

[automerger skipped] Ensure objects remain valid after calling policy am: 7d7ac480 am: 8d8ffe01 am: 2ed28382 -s ours am: 0a8731b2 -s ours am: 54d750ec -s ours

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

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



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