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: b5ac9bc6 am: d3c54b9e

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

Change-Id: I94917fc3847f9e25dc9a60780cf4b2a7a6dcc0cc