[automerger skipped] Merge "Implement Stylus Prediction Metrics" into...

[automerger skipped] Merge "Implement Stylus Prediction Metrics" into udc-qpr-dev am: 8143aeae am: f7790b91 -s ours

am skip reason: Merged-In Iec18415de9c3070f2b285c5c82f5a5e0ceaaf471 with SHA-1 52db4741 is already in history

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



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