Merge changes from topic "drawing-tablet" into udc-dev am: 2d18ba25

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



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