Merge "Fix safezone and getAlpha b/38361276 Test: frameworks/base/core/tests/coretests/src/android/graphics/drawable/IconTest.java" into oc-dev
am: cca181bfbb

Change-Id: Ie70026a3aec8155368d867b7b736634cf6492f44