[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypick-checkSessionParams-ixtl2uw7uua" into tm-qpr-dev am: 6759c173 -s ours am: 4d296bf7 -s ours am: 08fa9b35 -s ours am: 280a1dce -s ours

am skip reason: Merged-In Ib2af1afc78b3d9c6d8eb534e5f536aae153eeeb0 with SHA-1 ec8328db is already in history

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



Change-Id: I886a8344c80b1676f45a1152cdb97f58db5cf823
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>