Merge "Switch BlockCheck to hidden API that suppresses blocking after...
Merge "Switch BlockCheck to hidden API that suppresses blocking after emergency contact." into nyc-dev
am: a87e59d3
* commit 'a87e59d3':
Switch BlockCheck to hidden API that suppresses blocking after emergency contact.