Merge "OtaDexopt: Fix after-ota space measure" into nyc-mr1-dev am: 99fcdd96da am: 7044eb33de
am: d1efb8372b

Change-Id: I6a8ce6b97a5ddc1a7fbf2f3bee7eefe84e15cdcb