Merge "[automerger skipped] Merge "incident report args: add setter stubs &...

Merge "[automerger skipped] Merge "incident report args: add setter stubs & constant aliases" am: cdcd19f5 am: 024b5e64 -s ours am: 54b193d9 -s ours
am: 06cd3535 -s ours
am skip reason: change_id Ieaf5b3b4d67168e2a99ff54e6392c77d8372ed4e with SHA1 a8e78b9b is in history

Change-Id: I65743b7b6b521425c9d90f307b3f130ec2b76a3b