Merge "Continue to @hide freeform decor caption APIs" into oc-dev
am: 302ba2d3ab

Change-Id: I98135d6354a269669e176d9f4dee5b825578ff22