Merge changes from topic "shapes" into udc-qpr-dev am: 1672c54654

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

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