Merge "setShowGTalkServiceStatus() is deprecated but tested by CTS" into jb-mr1-dev