Merge "AdvertiseData: fix nullable collection" am: 0f12a22aa6 am: acb38137cd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80de479b73c6e8acb62c314ab25e2e93f5ed0669