Merge "Add systrace for VectorDrawable inflation and draw" into oc-mr1-dev am: dbe5afd90d
am: c0c225a837

Change-Id: I61898fdbe7db5cbef1863fc1604625501d11c4ec