Merge "[automerger skipped] Fix heap-use-after-free issue flagged by fuzzer...

Merge "[automerger skipped] Fix heap-use-after-free issue flagged by fuzzer test. am: 15b46d31 am: a2c38490 am: d1f93f8d -s ours am: a371459e -s ours am: 6baac194 -s ours am: 1dd576ce -s ours am: afd8c05c -s ours am: 554e8d19 -s ours am: afa346b6 -s ours" into udc-d1-dev-plus-aosp