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

Change-Id: I688ef5dd83d10529e8669dfb9e5ea818e0fdc348