Replace remaining "subtypeId" with "subtypeIndex"

This is a mechanical renaming CL. User observable behaviors should
remain unchanged.

Fix: 346662143
Flag: EXEMPT refactor
Test: presubmit
Change-Id: I9882ebab1406370e26ba4348f612ac6712b4cd4f
9 files changed