Merge "More default visibility for framework modules" am: 5b7010edc9 am: 4f8d9f32bd am: d7b4b55923 am: cf45e4ba22

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

Change-Id: I368df611b25f99cca30abc4c6f1a61c8d46e2fde