[automerger skipped] Merge "Make module stubs publicly visible" am: 09399b385c -s ours am: 8cce84605e -s ours am: 0f93824ccb -s ours am: ef2af20149 -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: I57bd360efc346544fae1827f25f760c7349a682c
This commit is contained in: