This reverts commit a22da1b2. Bug: 136293963 Reason for revert: No need, we use intent category instead. Change-Id: I7d401e091c8be85a9020f6750438fbbc98736503