This reverts commit 202e35b7cf.
Reason for revert: Breaks Launcher tests (b/191395224, http://go/forrest-run/L01400000924167319)
Bug: 191395224
Bug: 191492708
Bug: 191488971
Change-Id: I325a024daed9cf643f7cd2cb9a536637c13262fa
This reverts commit 202e35b7cf.
Reason for revert: Breaks Launcher tests (b/191395224, http://go/forrest-run/L01400000924167319)
Bug: 191395224
Bug: 191492708
Bug: 191488971
Change-Id: I325a024daed9cf643f7cd2cb9a536637c13262fa