[automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb
-s ours am: eae534cda7
am: 51692e38d2
am: 777ac0e39a
am: 74b4b59323
Change-Id: I763a164ab459cb41e0085857e23193d5224502cb
This commit is contained in: