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

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



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