Merge "Add @TestApi annotation to AdaptiveIconDrawable" into oc-dev