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

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

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



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