Merge "Don't update peer device in CoC client service" into android11-tests-dev