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: 8b294189 am: e458a2e4

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

Change-Id: Iff436aee9f384a871eacc0098544550230566005