[automerger skipped] Merge "Add basic ANR test" into rvc-dev am: 0979ea52 am: 30207d38 am: a2205169 am: 48838b12 -s ours

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

Original change: undetermined

Change-Id: I9b2b1a92614fff782a561e9c555e25cd34983822