Merge "Supports multiple-display on activated mode recording." into tm-dev am:...

Merge "Supports multiple-display on activated mode recording." into tm-dev am: 156ca219 am: 459021f8

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



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