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

am skip reason: Change-Id Id6f1bff59b08192f09ebcc4578a3c233fd1c2768 with SHA-1 4ddd1debbd is in history

Change-Id: Ia7b23cf0c9351057aeecc062dbf0fa77bf0f0804