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

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

Change-Id: Id597298b4bbe22ad4f343a622e9bda71387dca96