Merge "Merge "APM::updateCallRouting: ignore for stub output hal" into cw-f-dev am: 49209a3695 am: c20366a8b7" into nyc-mr2-dev-plus-aosp
am: 6d91c4fc36

Change-Id: I386c243669f43acf428d564c8ef04a90fd1f368e