Merge "Enable enhanced call blocking by default."
am: b6d55c2646

Change-Id: Ifec4eb98397237b80997fa46ef8447025ea57154