Merge "Include sdk-preprocess-files.mk before process sdk.atree" into main am:...

Merge "Include sdk-preprocess-files.mk before process sdk.atree" into main am: 8e0ce358 am: b8e6e297

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



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