Merge "Handle reentrant case in Room's acquireTransactionThread()" into snap-temp-L60900000959093030