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

Change-Id: I11d97f6c553882c0fb2423c1a62ee540378fcd25