Merge changes from topic "nullablecollection" am: 0a5c421c92 am: 43e0944217
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1567165 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia6baaacb15e7575f837da727ecbe6643dd93dfb4
This commit is contained in: