Revert "Correct recycling to take setViewId into account."

This reverts commit 308a272289cafedbb72bc7f5310ac54d50502ae7.

Bug: 183104573
Test: Install from Play Store with the screen off on wembley, and the device doesn't crash when the screen turns back on.

Change-Id: I289fcafc6685c4ede295e8d6916a54da9bac1ad5
4 files changed