Merge "Merge \"Added a virtual interface for Video Telephony call usage counting\" into nyc-mr1-dev am: 83e96c1957" into nyc-mr1-dev-plus-aosp