Merge "Merge "APM::updateCallRouting: ignore for stub output hal" into cw-f-dev am: 49209a3695 am: 56d69ea84f" into nyc-mr2-dev-plus-aosp
am: caed5aa37b

Change-Id: I0318c28ddcb1c90abbfc213e7b22ec72d61bf23f