Merge "[automerger skipped] Merge "incident report args: add setter stubs & constant aliases" am: cdcd19f560 am: 024b5e6477 -s ours am: 54b193d9ea -s ours am skip reason: change_id Ieaf5b3b4d67168e2a99ff54e6392c77d8372ed4e with SHA1 a8e78b9b88 is in history" into qt-r1-dev-plus-aosp