Merge "Support enhanced call blocking function" am: fdcdaee2d1
am: b70f2a1886

Change-Id: I70820d0d46a6c54de10b03e129a4b4df97e84a1e