Merge "Merge "Clean up the visibility rules for framework modules" into...
Merge "Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53 am: 1320192e am: 4c2b381a" into rvc-qpr-dev-plus-aosp am: 16dcf14b
Change-Id: Id8c27769dd4c9ee0d46720b880d73f7259d91102