Merge "Merge "Use a unique notification per screen recording" into udc-dev am:...

Merge "Merge "Use a unique notification per screen recording" into udc-dev am: 552d9571 am: 3dcf5e32" into udc-d1-dev-plus-aosp am: f44131b7

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



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