Merge changes from topic "nullablecollection" am: 0a5c421c92

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I754de2bd3b24e9027d6cf9776ea93e611a8e42c7
tree: d3d2bfc0c78c49010bf750d8dd772c615291a430
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS