Merge "Using clippath for adaptive icon drawable instead of bitmap shader"...

Merge "Using clippath for adaptive icon drawable instead of bitmap shader" into tm-qpr-dev am: aa3a5a36 am: 7426a459

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19370745



Change-Id: Ia2e44300f2498c3bfb142a301f343fb67eb08369
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>