Merge "Fix the first PUBLISH request should be triggered by the service." am: 8cec7441c9 am: 239c3fa4ca am: 19ca9a31db

Original change: https://android-review.googlesource.com/c/platform/cts/+/1597653

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I398f64a4c103ec028111dd947bf3bf6994ad6193