Merge "Grant visibility to compos subpackages." am: 21dea4eb3d am: 333f01ea08 am: be5e3975f6 am: a2faadb317

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

Change-Id: I83793f518f26fdc90a79a2b57da37fb440f5a281