Merge "Revert "Partial Screen Sharing - Use new app chooser base class"" into...

Merge "Revert "Partial Screen Sharing - Use new app chooser base class"" into udc-qpr-dev am: 80362f24

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



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