Merge changes from topic "phonestatelistener-limit-rvc-dev" am: 0167936be4

Change-Id: I23df0fed3c46b2aeb3bf561e82460ffc41a6928c
tree: 916c5713214d6ebe7e4b3e9112cfdfa1df399408
  1. core/
  2. services/
  3. tests/