Merge "hiddenapi: Handle visibility through inheritance" am: bfeee243 am: 341c9acb am: 226bbbb0 am: f3592695 Change-Id: Ic670b247e1991c4d6d5fe0801a0bf4f670ce5b1e