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

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

Change-Id: I2a2da7a5d4e7b83d4e4d8e7988cd30f0a78f2841