Merge "Move optimization to later part of pipeline" into tm-dev am: c912ad84...

Merge "Move optimization to later part of pipeline" into tm-dev am: c912ad84 am: 1d9dc514 am: 20d3ba50 am: f228f4be

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18396020



Change-Id: I191af7d815441ad505a35ff684703ea2128fd54a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>