Merge "Fix drawing the ring around adaptive app icons" into tm-qpr-dev am: 37e94389

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



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