Merge "Merge "Prune framework-all visibility" into rvc-dev am: ba71452e41 am: 14f4a45757" into rvc-d1-dev-plus-aosp am: 9a2ffc6013

Change-Id: Ie85fa241a50959065af47eda7024824b94ca737e