Merge "Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework. b/14118906"