Removing old workaround

Bug: 139137636
Test: presubmit
Change-Id: Iaa307c3d58f76ab7ee3b0a4a4a364b2b97d0efb7
1 file changed