Merge "Prevent committing session while in progress" into tm-qpr-dev am: 98a754b3

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



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