Merge changes from topic "am-b7f51cc6e8db451dac07e17ea01b9330" into android10-tests-dev

* changes:
  [automerger skipped] Merge "Fix race condition in BleClientTestBaseActivity" into pie-cts-dev am: 13ddf517dc -s ours
  [automerger skipped] Fix race condition in BleClientTestBaseActivity am: 1f91b069fe -s ours