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: c91e5dc4

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



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