Merge changes from topic "hookup-callscreening-api-2"
am: 70338952d2

Change-Id: I4d42b6f5e27deb829c2866a7babafd23e8d9100f