Merge "Introduce ANSWER_PHONE_CALLS permission"