Merge "Prune framework-all visibility" am: 228610294b

Change-Id: I4642738f0edd83cfff6b6f3fca2d451f3b2a3767