Merge "CDD: Require the restrictive behavior of hidden APIs to be consistent." into pi-dev
am: b2d01ba0c8

Change-Id: I439f34fcae41832d8c0b77e36673a3bab046fe61