Revert^2 "Add CreatorToken and CreatorTokenInfo"

This reverts commit dc8b0cf6bf11e699e3ca2d8b2443835536c08035.

Reason for revert: 
Fixed b/369445340 with ag/29583770

Change-Id: Ided6194949b92cafa26deb5fe60340692300905d
5 files changed