Merge "Adn queries for multi-SIM. (3/3)" into lmp-mr1-dev