Merge "Different hidden API enforcement policy for P & pre-P." into pi-dev