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

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



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