Merge "Support font resource in TextAppearanceSpan" into oc-mr1-dev
am: f0176103a2

Change-Id: I338ec369af7c076f82ecfc08d742d4e1c7cf331a