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: ae687e5a

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



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