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

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



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