Merge "Watchdog and sluggishness due to multiple virtual displays created by...

Merge "Watchdog and sluggishness due to multiple virtual displays created by third party apps" am: 42116a7e am: 10054ca8 am: 69144060 am: f5805847 am: 5cae8e9e am: b5c54108

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



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