Merge "AdvertiseData: fix nullable collection" am: 85f8cf7488 am: 8f608a49b5 am: 0a328d9fe2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6cad0419179b893a4b936ec03bc2f3ab9a92e5c5
tree: f0afbbe8eaa969729cee202d83f509936a2e5753
  1. framework/
  2. service/