[automerger skipped] Merge "Register VibrationSettings as a listener to: 1)...

[automerger skipped] Merge "Register VibrationSettings as a listener to: 1) virtual displays creation and removal. 2) App Uids running on virtual displays. These will be used in combination to ignore vibration initiated from a virtual display." into tm-qpr-dev am: 442f33f7 am: 47196b14 -s ours

am skip reason: Merged-In Ie10dbfe65bb3ab9d62ed5c7b5ed7095a51bccf24 with SHA-1 a0ae5c19 is already in history

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



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