Merge "Update intermediates dir of soong built system partition" into main am:...

Merge "Update intermediates dir of soong built system partition" into main am: a645e3d9 am: 296ffa17

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



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