[automerger skipped] Merge "Make module stubs publicly visible" am: 09399b38...

[automerger skipped] Merge "Make module stubs publicly visible" am: 09399b38 -s ours am: 8cce8460 -s ours am: 0f93824c -s ours am: ef2af201 -s ours am: 67da4bf8 -s ours

am skip reason: Change-Id Id0eee4bf4e78f5dfddf6ad569e49719fefde658e with SHA-1 d346b43c is in history

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

Change-Id: I2b41383e02e6fc06629342de1af4d0a061c2833f