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