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

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



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