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

Change-Id: If37d57349b8e1a59ac29a3322f19cf764fb277ca