Merge "Evaluate intermediate products properly" am: 90814c07 am: 5ada12d1...

Merge "Evaluate intermediate products properly" am: 90814c07 am: 5ada12d1 am: 0144f191 am: a621980c am: 74f23472

Original change: https://android-review.googlesource.com/c/platform/build/+/2060370



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