Merge changes from topic "fix-module-visibility" into sc-dev am: c97307a0

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

Change-Id: I1b206adf121c95a4c6996669cd9506b3f55556cd