Add dual detection for types that Parsoid is about to rename

Bug: 53432
Change-Id: If404585f9a118b4155ceb46fbe8e467b41ec6b29
Merge "Add dual detection for types that Parsoid is about to rename"