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

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

Change-Id: I53cf82b508d21d4d48a35e92528a564143217cd2