Merge "Merge "Create NeuralNetworks HAL v1.1 for new OperationTypes" am: 2ea233becb am: f86e9fe9fc am: 279fb7793e"