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: 805c0388 am: 2f339217 am: 0dd13ff3

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



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