[automerger skipped] Merge changes from topic "cherrypick-checkSessionParams-ixtl2uw7uua" into tm-qpr-dev am: 6759c17307 -s ours am: 4d296bf74a -s ours am: 08fa9b35bc -s ours
am skip reason: Merged-In Ib2af1afc78b3d9c6d8eb534e5f536aae153eeeb0 with SHA-1 ec8328db81 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22976593
Change-Id: Ifd144b550d581b5a165115ffaae1069e083b3a21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: