[automerger skipped] Merge "Restrict visibility of framework-module-common-defaults" into mainline-prod am: 512c41b92f -s ours

am skip reason: Change-Id I32a20de74c29b9fa1a0083bce084896aad99eb41 with SHA-1 7b5929720e is in history

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

Change-Id: Ia576b7e9f3a39e03e49eb66bc0561819ed4fd84f