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

Change-Id: I56a152f4716a25d86164fd8e6ac74b8d807248fc