[automerger skipped] Merge "Don't log account name on logcat (cherry-pick from master)" into pi-dev am: fc4dec32af
am: 914ff17590 -s ours
am skip reason: change_id Ic4b8448d10936c9368b1aab208ae7d8e78c3a1ae with SHA1 decc5ba2ac is in history

Change-Id: Ib0ec81ee3340278721413ad7de9cd0276edcff58