[automerger skipped] Merge "Remove unecessary member variables of...
[automerger skipped] Merge "Remove unecessary member variables of PhoneSwitcher." am: 25ddcbd6 am: c42f3203
am: fe0738e8 -s ours
am skip reason: change_id I078a876a66b40d93d12dcb52eb391c4b8a7ecfbd with SHA1 712cae9e is in history
Change-Id: I794227d1c777e40b0617d34822f352cfc9565ba1