Merge "Merge "Fix content capture session id collision bug" into rvc-dev am:...

Merge "Merge "Fix content capture session id collision bug" into rvc-dev am: dd9c140e am: 3618b46f am: a8122e5d" into rvc-qpr-dev-plus-aosp am: 81659831

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

Change-Id: I4e62f93b804817ea3cfe45faa0fff7b6c20ec2c9