Merge "sdk-addon: Prevent nested data/ inside $(PRIVATE_STAGING_DIR)" into...

Merge "sdk-addon: Prevent nested data/ inside $(PRIVATE_STAGING_DIR)" into main am: c80e7eeb am: dabe8ef1

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



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