Remove OPT_PREFIX_MAP from EntityIdFormatter

Change-Id: I9ecfc59e72840b06dc2d6abc699d073baf3388be
Merge "Remove OPT_PREFIX_MAP from EntityIdFormatter"