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

Merge "Set correct project id for sdk data directories" am: d2ce603b am: a607f48c am: 837d8b54 am: 3598d9e6 am: 2be39f59 am: 67e929cb

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



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