Merge "Change group id of sdk data directories" into tm-dev am: 6494999bb9 am: 4e29ef5726

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

Change-Id: Ie625a6b5a0573acf90cc3c2916fa8674e865d098