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