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

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



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