[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypick-checkSessionParams-ixtl2uw7uua" into tm-qpr-dev-plus-aosp am: 5305e936 -s ours am: b9605c34 -s ours am: 28fa6464 -s ours am: 5f2a7626 -s ours

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

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



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