[automerger skipped] Merge "Add basic ANR test" into rvc-dev am: 0979ea52c1 am: cc2a82e6c0 -s ours

am skip reason: Change-Id I0a1b28c2785d03d8870691641e0f7c6b1ca3b85e with SHA-1 ffaa2b1630 is in history

Change-Id: I389ddc7a74225eb1598f54f6263249c13c8b4f44