[automerger skipped] Merge "Reset the features in A11yInputFilter per display"...

[automerger skipped] Merge "Reset the features in A11yInputFilter per display" into sc-v2-dev am: f5cd3171 am: a2341446 -s ours

am skip reason: Merged-In I39ae59e12690240adbb0e81338dcb4c736a92197 with SHA-1 e6014fc0 is already in history

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

Change-Id: Iad3eb7b182c9f8d97a3f733ed54116a404b0d98f