Merge "Fix the bug that quick contact cannot be removed. am: 0065720a97 am: ea899c7948" into nyc-mr1-dev-plus-aosp
am: 9346ef5266

* commit '9346ef52661e1a53a4ec65ba4d9001f5020556d3':

Change-Id: I3af683ddc9b43d1d4b84d628b04ab26a70889e48