Merge changes I413ec5ed,Id667768c into udc-dev-plus-aosp

* changes:
  Attempt fixing test flakiness
  Relaunch the activity with current configuration to avoid flakiness