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

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



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