Merge "[automerger skipped] Merge "Test Data Stall with unknown detection type." into rvc-dev am: 01f7568231 -s ours am: 8692730679 -s ours" into rvc-d1-dev-plus-aosp am: b98bdd770f -s ours am: ab77236b75 -s ours

am skip reason: Change-Id Id6f1bff59b08192f09ebcc4578a3c233fd1c2768 with SHA-1 6609fbbfe1 is in history

Change-Id: I18941048d590bc21c790beec3fa84857a7db5459