27f0b77357
This reverts commit a333756f0c.
Reason for revert: Seems to permanently break flickr tests with a timeout (https://android-build.corp.google.com/test_investigate/?invocationId=I84700010216659574&testResultId=TR17229044551287787)
Bug: 310269045
Change-Id: I49631dc10111e7bcd4b663ec5b26ee79885da246
http://go/tapl