Merge "Make module stubs publicly visible" into rvc-dev am: f1f700094c am: 960e855286

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

Change-Id: I0bf60e5c708d5b50a370f2083a6cb5d1f52526bf