[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 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: I5fcc94d7f587db7367d590fb79b32f354c2dc04b