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

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



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