Merge "[automerger skipped] Merge "Run tests that rely on BlockedNumberProvider from secondary users." into pie-cts-dev am: 93ced69364 -s ours
am: dd5614f756

Change-Id: If1fe6e50d6c5189a9c68fdd678c89b90bf527ed8