Merge "Use explicit resource IDs for assist corner radii" into tm-qpr-dev am: d70608c1

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



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