Update category key values.

And revert changes made for TileUtils in I864e5aea because we don't need
to create a new metadata field for category

Bug: 31781480
Fix: 31780631
Test: compiles
Change-Id: Ia63c4047bfc675556a9c1c91472a68af2d455ec4