Merge "hal_tetheroffload: move hwservice mapping to core policy"