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

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

Change-Id: I45816986c8f05d2d67b5623162b6ce6a6c178059