[automerger skipped] Merge "Prevent committing session while in progress" into...

[automerger skipped] Merge "Prevent committing session while in progress" into tm-qpr-dev am: 98a754b3 am: 600dfc97 -s ours

am skip reason: Merged-In I1f5a90acde1874b3efbe4dad55f366e991bb4a21 with SHA-1 7d279c7d is already in history

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



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