Merge "Merge "Remove PROPERTY_WORK_CALL" into nyc-dev am: 5ee420c0d5 am: 741e0b14cf" into nyc-mr1-dev-plus-aosp