Merge "hiddenapi: Handle visibility through inheritance"
am: bfeee243c7

Change-Id: Ie4c89f5e9c7385e61318d9cd71a86aac9e244e3b