[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours

am skip reason: subject contains skip directive

Change-Id: Ia4397258a0b87af025c6d8a866c03a060555b462