[automerger skipped] Merge "MotionEvent: Don't update private flags when...

[automerger skipped] Merge "MotionEvent: Don't update private flags when setting flags from Java" into main am: ef3abf29 am: 29fa2d4e -s ours

am skip reason: Merged-In Ic9a78db6dbe2e880e321465f797298ae624d6f4d with SHA-1 32179949 is already in history

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



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