Merge "Restrict visibility of framework-module-common-defaults" am: 1de077e8fd am: 01091d8fe1 am: 2c4d7fcc1b am: 7de3848dc3

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

Change-Id: I55e3033ed15bd840a229cea3b99969a197dffe34