Merge "Support enhanced call blocking function" am: 5bafdd941f
am: e8602f5f8b

Change-Id: Ia9f7df546a5799f6455b43470898dffe23d51ec1