[automerger skipped] Merge "Make module stubs publicly visible" am: 09399b385c -s ours
am skip reason: Change-Id Id0eee4bf4e78f5dfddf6ad569e49719fefde658e with SHA-1 d346b43c1f is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418010
Change-Id: I8497a4acf15b8fcd1771381b82b9645850d9559d
This commit is contained in: