Merge "Add @TestApi annotation to AdaptiveIconDrawable" into oc-dev
am: 1e8f451bbf

Change-Id: I9d95fdcd56ccf99fe497b68f85fd5db036548a83