[automerger skipped] Fix UserInfo Parcel am: 5284336dec
am: 3cbb257821 -s ours
am skip reason: change_id I4502e901ff2aac977c584fa8c5a3d1263be33572 with SHA1 e80af14d33 is in history

Change-Id: I56867bfe7ffb9d8dcf04226d7600b815ad74eed2