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

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

Change-Id: Ic9be12f0ff77693c856060810bb29be5647122a7