Merge "Fix the logical failure in the testOwnerChangedBroadcast test case." into marshmallow-cts-dev