[automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours
am skip reason: subject contains skip directive

Change-Id: Id498eb2c8fe327e3639328d488db5900174240ec