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

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

Change-Id: Iaab5e01fd17824ff977fd14f35c66262abf41d96