Merge "Enable getting text_color_primary via Java." into oc-dr1-dev am: 29d430c5cc
am: b7f44dfce9

Change-Id: I1602e0d3fa6c42628e87720dae056757fc924bf3