Move BH test to flaky and change it slightly

Marked the test as flaky. Additionally, changed how mocks are created.
This may or may not affect the test's passing rate. Also updated the
double spy horribleness.

Bug: 79444334
Test: Ran atest, no functional changes
Change-Id: Ieb901a1702ab15bdf98f37cb4b37d5068882162d
2 files changed