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

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



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