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

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

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

Change-Id: Id4db3cd84529a22c5212622889f2d599d25d0a6c