Merge "Add basic ANR test" into rvc-dev am: 0979ea52c1

Change-Id: I790b02e0012bdc4496de464176a745339a08eb5f