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

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



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