Revert "Only mark queued transition as no-op if Shell-init"

This reverts commit 8185cfae.

Reason for revert: Droidmonitor created revert due to b/438724936. Will be verifying through ABTD before submission.

Fix: 438724936
Bug: 436919678
Change-Id: Iff35270067f85eba3f7d76a07ce13b71f6198c88