Merge "hiddenapi: Handle visibility through inheritance"