Revert "Split attachApplication to more accurately identify app startup"

This reverts commit 331ef23f78d36d224ca402742cae0fa0237b660a.

Reason for revert: b/261638650

Bug: 261638650
Test: Treehugger
Change-Id: I0890f8f25d5f522dbab9a9af0554e8565ae39379
6 files changed