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

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



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