Update references to Settings.EXTRA_SUB_ID.

Bug: 67751543
Test: TH only; no functional changes
Change-Id: I4252d0fb53532fbea73116cc7b79f2321df9fdcc
2 files changed