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

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



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