Merge "Ensure device owner changed broadcast completed" into pie-cts-dev
am: 0138d3986f

Change-Id: I83013802cbe55aeb4536d2eece8aad0f5d9d0eba