Merge "Add "Enable Phone Account" CTS Verifier Test." am: 2db2cb34cb am: 48a27db9f5 am: cd5e9780a7  -s ours
am: 6e902e0276

Change-Id: Iefee0b0309d6090f84bf663084e531b704ce4240