[automerger skipped] Merge "Change session ID string to ID object" into sc-dev am: 624a0f2d -s ours

am skip reason: skip tag Change-Id I931edf021a5ec6b27a25bc6142a129b92da0fc9a with SHA-1 8f8057ee is already in history

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

Change-Id: I20b2a64f53ebf289e8cda5cba9357574eeabf152