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: d9218d6a" into udc-d1-dev-plus-aosp am: 10c8eb96

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



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