[automerger skipped] Merge "Handle null repeated and nested fields in...

[automerger skipped] Merge "Handle null repeated and nested fields in VendorAtom" am: ef70e819 am: 90142555 am: 91e0b033 -s ours

am skip reason: Merged-In Id233024078d7daa658650765b26ff11ba9ca6f34 with SHA-1 9fc61df2 is already in history

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



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