Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5

Change-Id: I43891381685098f03005500e9049972c1a3c1b39