[automerger skipped] Merge changes from topic "nullablecollection" am:...

[automerger skipped] Merge changes from topic "nullablecollection" am: 60f3d5ce am: 57dd6872 am: af14107e -s ours am: a3765149 -s ours

am skip reason: Change-Id I5ce70d3e622fcdd13d63d47bf483507378a60e16 with SHA-1 c042e7c6 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1567165

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2417488f0cbc7c7a4a3a2f029875e5db7ca04660