Merge "APM::updateCallRouting: ignore for stub output hal am: a76c7de622 am: 0dd913994c" into nyc-mr2-dev-plus-aosp