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

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

Change-Id: Ibbefe910eeb28820ce22ba645b10016d77c2536a