Merge "Set correct project id for sdk data directories" am: d2ce603bf2

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2051230

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