Merge "Support enhanced call blocking function"
am: fdcdaee2d1

Change-Id: I26c38a7cca8a92011395da5e7ff758d482edbcab