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

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

Change-Id: Iee1bb7dbdb049345828180eebd9c4d0680eb36b7