Merge "Don't exempt android.os.cts from hiddenapi checks." into pi-dev