Revert "Otapreopt: Work around bug 38186355"

This reverts commit 12375069e753adea6c123fca7706b1018d358c92.

(cherry picked from commit efd53f88635840fe2a77fc836db57c4ecd94ed45)

Bug: 38186355
Bug: 38199123
Test: m
Test: manual OTA
Merged-In: Ie5b66d6ca5c3bc6af590bc7685234e75cc4d1ce4
Change-Id: Ie5b66d6ca5c3bc6af590bc7685234e75cc4d1ce4
1 file changed