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

Change-Id: If277d10980304fd589d5aaa66e25a10a2e95681f